summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-29 02:36:40 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-29 02:36:40 +0200
commit916984874570d631f341981ad207063ce4afbf94 (patch)
treed12d009a020749b7137e557d20a2a8456c38bca6
parent6fb28d1c61ad21453ff7d331b9c18576950c33b9 (diff)
downloadChimère - projet Saclay-916984874570d631f341981ad207063ce4afbf94.tar.bz2
Chimère - projet Saclay-916984874570d631f341981ad207063ce4afbf94.zip
Fix bad url import
-rw-r--r--local_settings.py.sample2
-rw-r--r--urls.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/local_settings.py.sample b/local_settings.py.sample
index 4b17152..58ce4e0 100644
--- a/local_settings.py.sample
+++ b/local_settings.py.sample
@@ -26,4 +26,6 @@ DATABASES = {
},
}
+CHIMERE_ENABLE_ROUTING = True
+
ROOT_URLCONF = 'chimere_saclay.urls'
diff --git a/urls.py b/urls.py
index 2f7e5ea..f07207c 100644
--- a/urls.py
+++ b/urls.py
@@ -33,10 +33,10 @@ urlpatterns += staticfiles_urlpatterns()
urlpatterns += patterns('',
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/', include(admin.site.urls)),
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', 'views.edit',
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', 'chimere_saclay.views.edit',
name="edit"),
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/(?P<item_id>\w+)/(?P<submited>\w+)?$',
- 'views.edit', name="edit-item"),
+ 'chimere_saclay.views.edit', name="edit-item"),
url(r'^', include('chimere.urls', namespace="chimere")),
)